Merge "Added ObjectCache::getMainStashInstance() and $wgMainStash"